From 3e017558dd7021309a36429c40d2a0449d11c9b6 Mon Sep 17 00:00:00 2001 From: "mwilli2@equilibrium.research.intel-research.net" Date: Mon, 12 Jul 2004 15:31:15 +0000 Subject: [PATCH] bitkeeper revision 1.1065 (40f2aec3dYgiVPACkpEwvEqCM-8iFg) Change dmesg path. --- tools/python/xen/xend/XendClient.py | 2 +- tools/python/xen/xend/XendDmesg.py | 2 +- tools/python/xen/xend/server/SrvNode.py | 5 +++++ tools/python/xen/xend/server/SrvRoot.py | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/xend/XendClient.py b/tools/python/xen/xend/XendClient.py index 2c8027dd02..534b163cc1 100644 --- a/tools/python/xen/xend/XendClient.py +++ b/tools/python/xen/xend/XendClient.py @@ -90,7 +90,7 @@ def eventurl(location, root, id=''): return urljoin(location, root, 'event/', id) def dmesgurl(location, root, id=''): - return urljoin(location, root, 'dmesg/', id) + return urljoin(location, root, 'node/dmesg/', id) def xend_request(url, method, data=None): """Make a request to xend. diff --git a/tools/python/xen/xend/XendDmesg.py b/tools/python/xen/xend/XendDmesg.py index b344f50c0d..b4a5ca9cad 100644 --- a/tools/python/xen/xend/XendDmesg.py +++ b/tools/python/xen/xend/XendDmesg.py @@ -1,6 +1,6 @@ # Copyright (C) 2004 Mike Wray -"""Get dmesg output for this node. Very basic right now! +"""Get dmesg output for this node. """ import os diff --git a/tools/python/xen/xend/server/SrvNode.py b/tools/python/xen/xend/server/SrvNode.py index 0e8807d2b5..fadd32309e 100644 --- a/tools/python/xen/xend/server/SrvNode.py +++ b/tools/python/xen/xend/server/SrvNode.py @@ -13,6 +13,7 @@ class SrvNode(SrvDir): def __init__(self): SrvDir.__init__(self) self.xn = XendNode.instance() + self.add('dmesg', 'SrvDmesg') def op_shutdown(self, op, req): val = self.xn.shutdown() @@ -48,11 +49,15 @@ class SrvNode(SrvDir): req.setHeader("Content-Type", sxp.mime_type) sxp.show(['node'] + self.info(), out=req) else: + url = req.prePathURL() + if not url.endswith('/'): + url += '/' req.write('') self.print_path(req) req.write('

%10s: %s' % (d[0], str(d[1]))) + req.write('
Xen dmesg output') req.write('

') req.write('') return '' diff --git a/tools/python/xen/xend/server/SrvRoot.py b/tools/python/xen/xend/server/SrvRoot.py index 1211ff4bca..8d38937b72 100644 --- a/tools/python/xen/xend/server/SrvRoot.py +++ b/tools/python/xen/xend/server/SrvRoot.py @@ -15,7 +15,6 @@ class SrvRoot(SrvDir): subdirs = [ ('node', 'SrvNode' ), ('domain', 'SrvDomainDir' ), - ('dmesg', 'SrvDmesg' ), ('console', 'SrvConsoleDir' ), ('event', 'SrvEventDir' ), ('device', 'SrvDeviceDir' ), -- 2.30.2